extract packaging changes from 4.9.51-1+rpi3 (cc06d18d3f86f44aaf0d621a0c99c5a8c68dfbdb)

diff --git a/debian/changelog b/debian/changelog
index 7e02e88ff63ab731bcbd6c9cbf7e5abe61401257..247e8632a43ae467802121c5040ebff608bf7497 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-4.9 (4.9.51-1+rpi3) stretch-staging; urgency=medium
+
+  * Re-enable usbip and cpupower packages.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 22 Oct 2017 11:49:09 +0000
+
 linux-4.9 (4.9.51-1+rpi2) buster-staging; urgency=medium
 
   * Try to make package binnmu safe.

diff --git a/debian/rules.real b/debian/rules.real
index c34ec9faa535885678dcbfa84f4c1c0efb696cd7..d32f4aad1612105923398b66423089854306d0a6 100644 (file)
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -75,7 +75,7 @@ binary-indep: install-support
 
 ifneq ($(DO_TOOLS),False)
   build-arch-arch: $(STAMPS_DIR)/build-tools
-  binary-arch-arch: install-kbuild
+  binary-arch-arch: install-kbuild install-usbip install-cpupower
 #  binary-arch-arch: install-liblockdep
   ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),)
     ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),)

diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in
index c3cf0bb5e7506dd9570cf1131bf2601b0a97a948..735c88c82eddaed4abe1fec70eaa582d4917cb68 100644 (file)
--- a/debian/templates/control.tools.in
+++ b/debian/templates/control.tools.in
@@ -6,6 +6,37 @@ Multi-Arch: foreign
 Description: Kbuild infrastructure for Linux @version@
  This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.
 
+Package: linux-cpupower
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Section: admin
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: CPU power management tools for Linux
+ The cpupower command allows inspection and control of cpufreq and
+ cpuidle tunables for hardware that support these features.  It
+ replaces "cpufreq-info" and "cpufreq-set" in cpufrequtils.
+ .
+ ${cpupower:Arch-Description}
+
+Package: libcpupower1
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: CPU frequency and voltage scaling tools for Linux (libraries)
+ This package contains the shared library.
+
+Package: libcpupower-dev
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Section: libdevel
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcpupower1 (= ${binary:Version})
+Provides: libcpufreq-dev
+Conflicts: libcpufreq-dev
+Replaces: libcpufreq-dev
+Description: CPU frequency and voltage scaling tools for Linux (development files)
+ This package contains the 'power/cpupower' headers and library shared objects.
+
 Package: linux-perf-@version@
 Build-Profiles: <!stage1 !pkg.linux.notools !nopython>
 Section: devel
@@ -23,6 +54,40 @@ Description: Performance analysis tools for Linux @version@
  The linux-base package contains a 'perf' command which will invoke the
  appropriate version for the running kernel.
 
+Package: libusbip-dev
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Architecture: linux-any
+Depends: ${misc:Depends}
+Section: libdevel
+Description: USB device sharing system over IP network (development files)
+ USB/IP is a system for sharing USB devices over the network.
+ .
+ This package provides headers for the libusbip library and
+ the library itself for static linking.
+
+Package: usbip
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Architecture: linux-any
+Depends: usbutils, ${shlibs:Depends}, ${misc:Depends}
+Section: admin
+Description: USB device sharing system over IP network
+ USB/IP is a system for sharing USB devices over the network.
+ .
+ To share USB devices between computers with their full
+ functionality, USB/IP encapsulates "USB requests" into IP
+ packets and transmits them between computers.
+ .
+ Original USB device drivers and applications can be used
+ for remote USB devices without any modification of them. A
+ computer can use remote USB devices as if they were
+ directly attached.
+ .
+ Currently USB/IP provides no access control or encryption.
+ It should only be used in trusted environments.
+ .
+ This package provides the server component 'usbipd' and the
+ client tool 'usbip'.
+
 Package: hyperv-daemons
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: i386 amd64 x32